From 56011425fdf440c1fe49c46fe30b4d08897883df Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 19 Sep 2008 11:42:24 +0000
Subject: [PATCH] Clean up inDnsBlacklist()

---
 includes/User.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 283fbb2ea2..a47065197c 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1105,19 +1105,15 @@ class User {
 
 		$found = false;
 		$host = '';
-		// FIXME: IPv6 ???
-		$m = array();
-		if ( preg_match( '/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $ip, $m ) ) {
+		// FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
+		if( IP::isIPv4($ip) ) {
 			# Make hostname
-			for ( $i=4; $i>=1; $i-- ) {
-				$host .= $m[$i] . '.';
-			}
-			$host .= $base;
+			$host = "$ip.$base";
 
 			# Send query
 			$ipList = gethostbynamel( $host );
 
-			if ( $ipList ) {
+			if( $ipList ) {
 				wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy says $base!\n" );
 				$found = true;
 			} else {
-- 
2.20.1